Adwaita: button.color fix

border-radius: 0 for colorswatch overlay as well.

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 022bbdfe54097bab329e8cec84fd692896d337c7..7fef5610bf2f321b7bf77b9760ca05959d4aaf83 100644 (file)
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -746,9 +746,8 @@ modelbutton.flat,
 button.color {
   padding: 5px; // Uniform padding on the GtkColorButton
 
-  colorswatch:first-child:last-child { // :first-child:last-child for a specificity bump, it gets overridden by the
-                                          // colorpicker style, otherwise
-    border-radius: 0;
+  > colorswatch:first-child:last-child { // :first-child:last-child for a specificity bump, it gets overridden by the colorchooser style
+    > overlay, & { border-radius: 0; }
     box-shadow: inset 0 1px 1px transparentize(black, 0.9),
                 _widget_edge();
     &:insensitive,

diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index e24a51aa1666bb01b752f8a83a8987c94e8bc2d2..3d4d4dfec93732d6946c7051dcd9d66cd5bf19f7 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1213,10 +1213,15 @@ modelbutton.flat,
 button.color, headerbar button.color.titlebutton,
 .titlebar button.color.titlebutton {
   padding: 5px; }
-  button.color colorswatch:first-child:last-child {
-    border-radius: 0;
+  button.color > colorswatch:first-child:last-child, headerbar button.color.titlebutton > colorswatch:first-child:last-child,
+  .titlebar button.color.titlebutton > colorswatch:first-child:last-child {
     box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
-    button.color colorswatch:first-child:last-child:insensitive, button.color colorswatch:first-child:last-child:backdrop {
+    button.color > colorswatch:first-child:last-child > overlay, button.color > colorswatch:first-child:last-child, headerbar button.color.titlebutton > colorswatch:first-child:last-child,
+    .titlebar button.color.titlebutton > colorswatch:first-child:last-child {
+      border-radius: 0; }
+    button.color > colorswatch:first-child:last-child:insensitive, headerbar button.color.titlebutton > colorswatch:first-child:last-child:insensitive,
+    .titlebar button.color.titlebutton > colorswatch:first-child:last-child:insensitive, button.color > colorswatch:first-child:last-child:backdrop, headerbar button.color.titlebutton > colorswatch:first-child:last-child:backdrop,
+    .titlebar button.color.titlebutton > colorswatch:first-child:last-child:backdrop {
       box-shadow: none; }
 
 /*********

diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 9081ad9af126578058006b78d60eb5c9d3e72671..77c1b67a86cc4de72686b79fc96bcfa4607d4d61 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1213,10 +1213,15 @@ modelbutton.flat,
 button.color, headerbar button.color.titlebutton,
 .titlebar button.color.titlebutton {
   padding: 5px; }
-  button.color colorswatch:first-child:last-child {
-    border-radius: 0;
+  button.color > colorswatch:first-child:last-child, headerbar button.color.titlebutton > colorswatch:first-child:last-child,
+  .titlebar button.color.titlebutton > colorswatch:first-child:last-child {
     box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 1px white; }
-    button.color colorswatch:first-child:last-child:insensitive, button.color colorswatch:first-child:last-child:backdrop {
+    button.color > colorswatch:first-child:last-child > overlay, button.color > colorswatch:first-child:last-child, headerbar button.color.titlebutton > colorswatch:first-child:last-child,
+    .titlebar button.color.titlebutton > colorswatch:first-child:last-child {
+      border-radius: 0; }
+    button.color > colorswatch:first-child:last-child:insensitive, headerbar button.color.titlebutton > colorswatch:first-child:last-child:insensitive,
+    .titlebar button.color.titlebutton > colorswatch:first-child:last-child:insensitive, button.color > colorswatch:first-child:last-child:backdrop, headerbar button.color.titlebutton > colorswatch:first-child:last-child:backdrop,
+    .titlebar button.color.titlebutton > colorswatch:first-child:last-child:backdrop {
       box-shadow: none; }
 
 /*********